Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 11 Aug 2010 03:20:07 +0000 (03:20 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 11 Aug 2010 03:20:07 +0000 (03:20 +0000)

Trivial merge